Revert 1ec5fb3..d2b8a10

This rolls back to commit 1ec5fb3ff61da57290232ff0546227840ae527bb.