Revert 3738f24..493e76c

This rolls back to commit 3738f24421d6f3bd10e5ef9ebfc10f702a5cb7ac.