Revert 3755ca7..f7459d4

This rolls back to commit 3755ca7ae1b6c4b76d306a36215830a82169eb62.