Revert 0b30acb..8d15d0d

This rolls back to commit 0b30acbe04969ab0a95b660f6b5dac1aa949d8f8.