Revert b80d22e..b516bcc

This rolls back to commit b80d22e64cf762c9d3c77810404bb65681d280df.