Revert 0bc20bf..b3b22af

This rolls back to commit 0bc20bfda068944f699ef8d0f78fb126aee995d0.