Revert c62f56b..2a57fc3

This rolls back to commit c62f56b99ad2629caed229e1665059ae49775546.