Revert bbdd8a9..5106c19

This rolls back to commit bbdd8a92a41a4c32b246383a2c297a7592968055.