Revert 7253d26..ecd957b

This rolls back to commit 7253d261b63817647f8a7f2abfc6fd11136c522b.
conflicts resolved