Revert 4201362..f7291e7

This rolls back to commit 4201362b2c36183c004f2064ba74bbe2bc78cf2d.