Revert 9126676..59037d0

This rolls back to commit 9126676654b836c7e9e806b83349d520afa185f0.