Revert 9742754..0508c9a

This rolls back to commit 97427541dca0449a5bb963da87c6923d750d950a.