Revert 295c58b..a65db62

This rolls back to commit 295c58b3fe8d29f1db4974a0e4fd852c471872e4.