Revert 53230ff..c2b9848

This rolls back to commit 53230ff4f959cada288bc1e773671fb73c341292.