Revert 57ecfc9..70c677b

This rolls back to commit 57ecfc954594c059c536a5a263da9fa41493bad2.
Resolved conflicts