Temporarily revert functionality change from my previous patch;