Revert faed55f..1243a8b

This rolls back to commit faed55fdb05074071651d626243e155046ae12f9.