Revert a72ae50..c262a05

This rolls back to commit a72ae50f7ea68a0e1b42ee7c4a1fc51aa90f3089.