Revert 710db50..4f13bed

This rolls back to commit 710db5025bcce2253f8f6829908f41b1aa544fe8.