Revert 785ff39..2bb5fea

This rolls back to commit 785ff39ee664cad452faa3f3f184745ee473024a.