Revert 31892fa..fdd89aa

This rolls back to commit 31892fa853953b923d2e23ad20eff25d2270b30e.