Revert 9e12166..540e8d8

This rolls back to commit 9e12166ceddfc451afc0abfb3f68202043b473d3.