Revert 5acf239..8beacfb

This rolls back to commit 5acf23979d94834b110b826871b2917226f5caf0.