Revert 7c307e6..ec9888e

This rolls back to commit 7c307e68c8bcfcff3d34d085ada4973ee78d1a4f.