Revert fb75726..103288f

This rolls back to commit fb75726444133a374d222f65305c656a25adc059.
Revert aed804c..7280f7c

This rolls back to commit aed804ca8254242b7a94f8c0ee29dec7e72437af.