Revert 5a8196f..da05b14

This rolls back to commit 5a8196fb86ec6088d47521addabc1f376e153480.