Revert 61c0894..2dc64f6

This rolls back to commit 61c089425471fcd09752b2c37b4e46f40160c403.