Revert 3716089..bf554b6

This rolls back to commit 37160894edd2ba9b8c157816f5d0e03b99e67c5c.