Revert 9dcb8a0..472e0d1

This rolls back to commit 9dcb8a0ca6cc8b26e6147e47734edfdef67f21a8.