Revert 274c42f..b663914

This rolls back to commit 274c42f5c6980faa91aa9e628dc1d3bec6b47637.