Revert c34c987..eab152e

This rolls back to commit c34c98768aa58610a1e46e8a34c63e8587cea7f4.