Revert dd5bc32..9bf16db

This rolls back to commit dd5bc32b2ac34ff63bb380eb9334fa4fe5bfb6c3.