Revert 73a9bc0..d407379

This rolls back to commit 73a9bc0f697f2832654f983654e0afa2b37f36fe.