Revert bb54a1e..508448b

This rolls back to commit bb54a1e23d4758be84e7f9df883ce53e2ab7dd02.