Revert 8d1d86e..999c8eb

This rolls back to commit 8d1d86eb181dbde9df3aae193ef74fc47789678a.