Revert 5b2e287..532daed

This rolls back to commit 5b2e28773fec07c1095b2ccac737a72806286a70.