Revert fd69ee4..5535d04

This rolls back to commit fd69ee4a74e0475cab161db943ea4f298dbee3c8.