Revert 4cba02e..416901f

This rolls back to commit 4cba02e04c31225f1cc43e4a1c33560045a83b6f.