Revert 4e9e88e..30718d0

This rolls back to commit 4e9e88e7fd0d928b8b6a1022f8f5fd0854c25fb3.