Revert bb5323e..58ba5e6

This rolls back to commit bb5323e1557380fc9c37bbd8462e40fe38fd39de.