Revert 606f85e..1176e51

This rolls back to commit 606f85eeb440476a8b1c3bc1c6c189d98f7c0359.