Revert 2d55320..9e084cc

This rolls back to commit 2d553200ac40522b95d9c600e7d874f5e5cc1282.