Revert 329c3de..781c78f

This rolls back to commit 329c3de5576d3d9230d75484c768a3ef290c5f84.