Revert 2cc16ca..fb31dd4

This rolls back to commit 2cc16ca1b1355cf7deec2db4888a8088888cb22d.
random