Revert 24627fb..d1b047f

This rolls back to commit 24627fbd8fbe69bcb8cf53f3fe8f75822a493e95.