Revert 4c2a6e1..f7a6a8d

This rolls back to commit 4c2a6e1ab6cce5ee2b7cdc464e251c6b84450d35.