Revert 2ac50a0..3c54f9c

This rolls back to commit 2ac50a0474d7e2147aec00cb0099e0160c9744ab.