Revert 531917c..925005a

This rolls back to commit 531917c44924a5e4c8588f2024528028677d7991.