Revert 8ab17f0..c45939f

This rolls back to commit 8ab17f085ede36007a41028966589d19238014c7.