Revert 0a5894e..dd1c435

This rolls back to commit 0a5894edc9cf05a991244e8da32349a7c164eb73.