Revert 82015b5..55ba3c2

This rolls back to commit 82015b574770c653c9305c998f22e8bbcaf19ef8.