Revert 4a42d87..8b12435

This rolls back to commit 4a42d8724b89253a2bd194964b099bf81de502ab.