Revert f57a96f..b6ffaa8

This rolls back to commit f57a96f8c33427cd133e110b9e40fe65315132b3.