Revert 9cfa9b1..cebeb0a

This rolls back to commit 9cfa9b17201c37aadb18448516e90ce9587406db.