Revert 743e6d8..5c816e6

This rolls back to commit 743e6d852f2f0719d283dd4140b911b6a116c900.