Revert 7256e48..78b9e21

This rolls back to commit 7256e48b83140dfbb0d7899e8a75d65759ae9b40.