Revert 4e8291e..90ec539

This rolls back to commit 4e8291ef98bc6771ae41c9e25bf1f13e2f24c2dc.