Revert 8f9627a..67d3542

This rolls back to commit 8f9627a929d286661b5b2bd1c0ce271495fdd8da.