Revert e46ab57..090fc10

This rolls back to commit e46ab57a2260b5593f9bcb20dea91d0083d25be6.