Revert 4b63a48..2cde2e2

This rolls back to commit 4b63a48fb2581eb6ffb85bb6cc18bb7b670e2f75.