Revert 49c6dc1..7b161e5

This rolls back to commit 49c6dc1084ab2baeaee8a43d1ee735ed69bb46ee.