Revert 8d32038..884f204

This rolls back to commit 8d32038ca3cdff6a435db5fe2654311291055ef7.