Revert 1c61822..0147776

This rolls back to commit 1c61822d8ca0bf655016df60e4eed2171eeeee7b.