Revert 25269d3..595912f

This rolls back to commit 25269d3e71fbdd5376ac0004300bda8833fa07b4.