Revert 2a7cca7..54efbb7

This rolls back to commit 2a7cca7a68883078234c16cdda71a35a7e0ec9f3.