Revert 516275a..a5096b6

This rolls back to commit 516275a4f7d474742c36e47df33644886acce7ec.
2:15