Revert 4dde877..7255339

This rolls back to commit 4dde877a0adc19b46c63676585d89b7223cd9888.
prep