Revert 8f60bea..ab456ae

This rolls back to commit 8f60bea0f78e280ecf1b83e302419593a11ade61.