Revert a98645a..a3f5797

This rolls back to commit a98645a2d8f67aedb18cd28a08257268aa514d3e.