Revert f2d8a2d..e50057d

This rolls back to commit f2d8a2d2e728af3327d2d3766e9283f644faaece.