Revert 7c9a123..d95a13a

This rolls back to commit 7c9a1236b00dec101c6c61703f9e138edd2718aa.