Revert 01c8ebc..a40f34c

This rolls back to commit 01c8ebc691f04ac9c311955f4622f77df224e8ff.