Revert 674bac7..4347045

This rolls back to commit 674bac7c2c1f2485d617a2dd9b22f3c8d06246c6.