Revert 92caee1..135aa43

This rolls back to commit 92caee1ee414d33abba25056d18dc7447ea9e0ce.