Revert 8099490..ceced70

This rolls back to commit 809949013973a0992f3f5686202f4f0ac9527d56.