Revert 23dbf4f..0c0cb01

This rolls back to commit 23dbf4fd0d8d1c3c36f91d3ce95509f5138aa5f7.