Revert 288c057..f20a60e

This rolls back to commit 288c0575e6d0ebd37479268ee25fe11755e36595.