Revert bcf8a54..8d2368b

This rolls back to commit bcf8a546192f49fe04224ae3b32c8d1de0769c41.