Revert a8077e2..9dc242b

This rolls back to commit a8077e2bb972d3e5d674d7154c810185986fc7b1.