Revert 66b34f5..3abb553

This rolls back to commit 66b34f5b1ffb172d9701f3abd97d73192cc3c9c3.