Revert 4a08e08..3cb89cc

This rolls back to commit 4a08e08e4d6c1e7f4343bc5332324eb1888d2564.