Revert 26d68cc..8ed746f

This rolls back to commit 26d68cc794e1f66539233925a2f31f7ac4eb5507.